Fix conflict Git markers
authorBruce Cowan <bruce@bcowan.me.uk>
Tue, 25 May 2010 19:27:43 +0000 (20:27 +0100)
committerJavier Jardón <jjardon@gnome.org>
Tue, 25 May 2010 19:46:35 +0000 (21:46 +0200)
commita538f639b69a39d7bb85b39af2dfd296d28fc0aa
treee2cb258c1fa3f8d212623de2e54b2606f6108df3
parent0c6565e1d3ecfae3bca096d554cb8d5378bdfcb0
Fix conflict Git markers

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=619655
gtk/gtkfilechooser.c
gtk/gtkscrolledwindow.c